updated to allow simple switch between gdiplus- and former fileformat

2008-06-13  Hans Breuer  <hans@breuer.org>

	* makefile.msc : updated to allow simple switch between gdiplus- and
	former fileformat backends
	* io-tiff.c : use g_snprintf

svn path=/trunk/; revision=20369

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index d22b6c77d82ad931dc16b250ba2ddd6ab3c4d58e..d0973342bb6c08383ff7a9b986af6d4ab6aef069 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-13  Hans Breuer  <hans@breuer.org>
+
+       * makefile.msc : updated to allow simple switch between gdiplus- and
+       former fileformat backends
+       * io-tiff.c : use g_snprintf
+
 2008-06-13  Matthias Clasen  <mclasen@redhat.com>
 
        Bug 531960 – crash in eog-image.c:1154: (priv->image != NULL)

diff --git a/gdk-pixbuf/io-tiff.c b/gdk-pixbuf/io-tiff.c
index 64da064883bf560deb81a28748aadfb34b2bc5c3..84ddd0266fa1ede97b6dad8ed231c4a12765d28a 100644 (file)
--- a/gdk-pixbuf/io-tiff.c
+++ b/gdk-pixbuf/io-tiff.c
@@ -262,7 +262,7 @@ tiff_image_parse (TIFF *tiff, TiffContext *context, GError **error)
 
        if (transform > 0 ) {
                gchar str[5];
-               snprintf (str, sizeof (str), "%d", transform);
+               g_snprintf (str, sizeof (str), "%d", transform);
                gdk_pixbuf_set_option (pixbuf, "orientation", str);
        }
 

diff --git a/gdk-pixbuf/makefile.msc b/gdk-pixbuf/makefile.msc
index 1aee962256d14433031fcdad2a582e8d471f2564..62020f4ea0cda253901b6826064b09eeb8517efa 100644 (file)
--- a/gdk-pixbuf/makefile.msc
+++ b/gdk-pixbuf/makefile.msc
@@ -13,13 +13,22 @@ GDK_PIXBUF_VER = 2.0
 
 # -DINCLUDE_gdiplus _replaces_ -DINCLUDE_bmp -DINCLUDE_gif -DINCLUDE_ico -DINCLUDE_jpeg  -DINCLUDE_tiff
 # but not yet -DINCLUDE_png 
+##USEGDIP=1
 # to get _working_ include modules we need respective defines ...
-BUILT_IN_FORMATS = -DINCLUDE_gdiplus -DINCLUDE_png \
+BUILT_IN_FORMATS = \
+!IFDEF USEGDIP
+       -DINCLUDE_gdiplus \
+!ELSE
+       -DINCLUDE_bmp -DINCLUDE_gif -DINCLUDE_ico -DINCLUDE_jpeg  -DINCLUDE_tiff \
+!ENDIF
+       -DINCLUDE_png \
        -DINCLUDE_xpm -DINCLUDE_wbmp \
        -DINCLUDE_pnm -DINCLUDE_ras
 
 PKG_CFLAGS = -FImsvc_recommended_pragmas.h \
-#      $(JPEG_CFLAGS) $(TIFF_CFLAGS) \
+!IFNDEF USEGDIP
+       $(JPEG_CFLAGS) $(TIFF_CFLAGS) \
+!ENDIF
        -I. -I.. $(GLIB_CFLAGS) \
        $(BUILT_IN_FORMATS) \
        $(PNG_CFLAGS) $(INTL_CFLAGS) \
@@ -30,7 +39,9 @@ PKG_CFLAGS = -FImsvc_recommended_pragmas.h \
 #      -DUSE_GMODULE -DPIXBUF_LIBDIR=\".\"
 
 PKG_LINK = $(GLIB_LIBS) \
-#      $(TIFF_LIBS) $(JPEG_LIBS) \
+!IFNDEF USEGDIP
+       $(TIFF_LIBS) $(JPEG_LIBS) \
+!ENDIF
        $(PNG_LIBS) $(INTL_LIBS) \
        pixops\pixops.lib \
  
@@ -70,7 +81,11 @@ OBJECTS = \
        io-pnm.obj \
        io-ras.obj \
        io-xpm.obj \
+!IFDEF USEGDIP
        $(OBJECTS_NATIVE)
+!ELSE
+       $(OBJECTS_NON_NATIVE)
+!ENDIF
 
 gdk_pixbuf_headers =   \
        gdk-pixbuf.h    \